bitkeeper revision 1.1513 (4291f527HzSV5MgVTL5ZpTs61-VQvg)

mk.linux-2.6-xenU, mk.linux-2.6-xen0, Rules.mk, Config.mk:
  Move {COMPILE,TARGET}_{,SUB}ARCH} definition into xen/Rules.mk.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/Config.mk b/Config.mk
index 802f499f76e189e9f16b74f1aae6195ca1d298c0..b3320b271160be4705eef3e8a8132e6bcb4ce336 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -4,12 +4,6 @@
 XEN_COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/)
 XEN_TARGET_ARCH     ?= $(XEN_COMPILE_ARCH)
 
-# Set ARCH/SUBARCH appropriately.
-override COMPILE_SUBARCH := $(XEN_COMPILE_ARCH)
-override TARGET_SUBARCH  := $(XEN_TARGET_ARCH)
-override COMPILE_ARCH    := $(patsubst x86%,x86,$(XEN_COMPILE_ARCH))
-override TARGET_ARCH     := $(patsubst x86%,x86,$(XEN_TARGET_ARCH))
-
 # Tools to run on system hosting the build
 HOSTCC     = gcc
 HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer 

diff --git a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0
index 099120c4d47105bf0ea0f298864d9b4f38d81c32..4a123641a83991145168ecdc183d7191d27c50a1 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xen0
+++ b/buildconfigs/mk.linux-2.6-xen0
@@ -33,7 +33,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
        CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
        [ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
          cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
-         || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(TARGET_SUBARCH) \
+         || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
                $(LINUX_DIR)/.config
        $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
 

diff --git a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU
index f686e9507783a892bd3985efcc937be8d7e7a56c..b83244efd0f03656490810e9a556d4c7a51a7979 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xenU
+++ b/buildconfigs/mk.linux-2.6-xenU
@@ -33,7 +33,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
        CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
        [ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
          cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
-         || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(TARGET_SUBARCH) \
+         || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
                $(LINUX_DIR)/.config
        $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
 

diff --git a/xen/Rules.mk b/xen/Rules.mk
index 1db12a3d0d65bf328522f898bb8a0d714d3ddcdc..221882814a633ede954d696776be487898404fe5 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -10,6 +10,12 @@ crash_debug ?= n
 
 include $(BASEDIR)/../Config.mk
 
+# Set ARCH/SUBARCH appropriately.
+override COMPILE_SUBARCH := $(XEN_COMPILE_ARCH)
+override TARGET_SUBARCH  := $(XEN_TARGET_ARCH)
+override COMPILE_ARCH    := $(patsubst x86%,x86,$(XEN_COMPILE_ARCH))
+override TARGET_ARCH     := $(patsubst x86%,x86,$(XEN_TARGET_ARCH))
+
 TARGET  := $(BASEDIR)/xen
 HDRS    := $(wildcard $(BASEDIR)/include/xen/*.h)
 HDRS    += $(wildcard $(BASEDIR)/include/public/*.h)